From f646e475e7b716ed9bd2f8c5cb6fddf9319a629f Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 29 Aug 2008 04:26:19 +0000 Subject: [PATCH] =?utf8?q?Bug=20549262=20=E2=80=93=20GtkScrolledWindow=20s?= =?utf8?q?hould=20not=20accept=20focus=20unless?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2008-08-29 Matthias Clasen Bug 549262 – GtkScrolledWindow should not accept focus unless GTK_CAN_FOCUS is set * gtk/gtkscrolledwindow.c (gtk_scrolled_window_focus): only grab the focus, if GTK_WIDGET_CAN_FOCUS() returns TRUE. Patch by Sven Herzberg svn path=/trunk/; revision=21233 --- ChangeLog | 9 +++++++++ gtk/gtkscrolledwindow.c | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b84bea3291..b3f5e74a0a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-08-29 Matthias Clasen + + Bug 549262 – GtkScrolledWindow should not accept focus unless + GTK_CAN_FOCUS is set + + * gtk/gtkscrolledwindow.c (gtk_scrolled_window_focus): only grab the + focus, if GTK_WIDGET_CAN_FOCUS() returns TRUE. Patch by Sven + Herzberg + 2008-08-29 Matthias Clasen * gtk/gtk.symbols: diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index 78f1110295..8134792a1f 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -1547,7 +1547,7 @@ gtk_scrolled_window_focus (GtkWidget *widget, return TRUE; } - if (!had_focus_child) + if (!had_focus_child && GTK_WIDGET_CAN_FOCUS (widget)) { gtk_widget_grab_focus (widget); return TRUE; -- 2.30.2